Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: revamp CI v0.8.25 #559

Merged
merged 3 commits into from
May 28, 2024
Merged

chore: revamp CI v0.8.25 #559

merged 3 commits into from
May 28, 2024

Conversation

antonbaliasnikov
Copy link
Collaborator

@antonbaliasnikov antonbaliasnikov commented May 28, 2024

What ❔

  • Unify and update CI scripts: introduce matrix jobs, use common integration tests and benchmarks (remove necessity to create special configs)
  • Rename ZKEVM to ZKsync everywhere
  • Fix versioning - use only the second part of the tag as the ZKsync version
  • Make the ZKsync part of the changelog more unified

Why ❔

Fixes CPR-1689

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.

@hedgar2017
Copy link
Collaborator

@antonbaliasnikov why the main workflow runs Y+M3B3?

@hedgar2017 hedgar2017 changed the title Aba ci rebrand 0.8.25 chore: rebrand v0.8.25 May 28, 2024
@hedgar2017 hedgar2017 changed the title chore: rebrand v0.8.25 chore: revamp CI v0.8.25 May 28, 2024
@antonbaliasnikov
Copy link
Collaborator Author

@antonbaliasnikov why the main workflow runs Y+M3B3?

It's in progress, I'm creating cache to speed up runs.

@hedgar2017
Copy link
Collaborator

@antonbaliasnikov why the main workflow runs Y+M3B3?

It's in progress, I'm creating cache to speed up runs.

Ok.
So the mode will be 0.8.25 in the end, right?

@antonbaliasnikov
Copy link
Collaborator Author

@antonbaliasnikov why the main workflow runs Y+M3B3?

It's in progress, I'm creating cache to speed up runs.

Ok. So the mode will be 0.8.25 in the end, right?

Yes

Copy link

github-actions bot commented May 28, 2024

Benchmark results:

╔═╡ Size (-%) ╞════════════════╡ All M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞══════════════╡ All M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞════════════════╡ All M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞════════════════╡ All MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞══════════════╡ All MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞════════════════╡ All MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞═════╡ EVMInterpreter M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                                 NaN ║
╠═╡ Cycles (-%) ╞═══╡ EVMInterpreter M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞═════╡ EVMInterpreter M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs/gas ╞══════╡ EVMInterpreter M3B3 ╞═╣
║ ADD                                69.333 ║
║ MUL                                40.400 ║
║ SUB                                69.333 ║
║ DIV                                48.800 ║
║ SDIV                               65.600 ║
║ MOD                                47.600 ║
║ SMOD                               63.200 ║
║ ADDMOD                             39.625 ║
║ MULMOD                             36.625 ║
║ EXP                                 9.667 ║
║ SIGNEXTEND                         46.400 ║
║ LT                                 73.333 ║
║ GT                                 73.333 ║
║ SLT                                97.333 ║
║ SGT                                95.333 ║
║ EQ                                 73.333 ║
║ ISZERO                             65.000 ║
║ AND                                67.333 ║
║ OR                                 69.333 ║
║ XOR                                69.333 ║
║ NOT                                61.000 ║
║ BYTE                               77.333 ║
║ SHL                                75.333 ║
║ SHR                                73.333 ║
║ SAR                                91.333 ║
║ SGT                                95.333 ║
║ SHA3                               28.519 ║
║ ADDRESS                            93.781 ║
║ BALANCE                            73.230 ║
║ ORIGIN                           1389.969 ║
║ CALLER                             93.781 ║
║ CALLVALUE                          93.781 ║
║ CALLDATALOAD                       63.333 ║
║ CALLDATASIZE                       94.000 ║
║ CALLDATACOPY                       71.533 ║
║ CODESIZE                           91.000 ║
║ CODECOPY                          145.574 ║
║ GASPRICE                         1392.688 ║
║ EXTCODESIZE                         5.149 ║
║ EXTCODECOPY                         4.667 ║
║ RETURNDATASIZE                     89.000 ║
║ RETURNDATACOPY                     55.889 ║
║ EXTCODEHASH                         9.087 ║
║ BLOCKHASH                         244.700 ║
║ COINBASE                         1392.969 ║
║ TIMESTAMP                        1389.969 ║
║ NUMBER                           1389.969 ║
║ PREVRANDAO                       1389.969 ║
║ GASLIMIT                         1395.969 ║
║ CHAINID                          1389.969 ║
║ SELFBALANCE                       641.312 ║
║ BASEFEE                          1386.969 ║
║ POP                                81.500 ║
║ MLOAD                              80.186 ║
║ MSTORE                             82.069 ║
║ MSTORE8                            89.912 ║
║ SLOAD                              27.212 ║
║ SSTORE                              9.099 ║
║ JUMP                               37.333 ║
║ JUMPI                              32.818 ║
║ PC                                 94.281 ║
║ MSIZE                             103.781 ║
║ GAS                                88.281 ║
║ JUMPDEST                          127.562 ║
║ PUSH0                              91.281 ║
║ PUSH1                              78.854 ║
║ PUSH2                              96.854 ║
║ PUSH4                             158.854 ║
║ PUSH5                             180.854 ║
║ PUSH6                             202.854 ║
║ PUSH7                             224.854 ║
║ PUSH8                             246.854 ║
║ PUSH9                             268.854 ║
║ PUSH10                            290.854 ║
║ PUSH11                            312.854 ║
║ PUSH12                            332.854 ║
║ PUSH13                            356.854 ║
║ PUSH14                            378.854 ║
║ PUSH15                            400.854 ║
║ PUSH16                            422.854 ║
║ PUSH17                            444.854 ║
║ PUSH18                            466.854 ║
║ PUSH19                            488.854 ║
║ PUSH20                            510.854 ║
║ PUSH21                            532.854 ║
║ PUSH22                            554.854 ║
║ PUSH23                            576.854 ║
║ PUSH24                            598.854 ║
║ PUSH25                            620.854 ║
║ PUSH26                            642.854 ║
║ PUSH27                            664.854 ║
║ PUSH28                            686.854 ║
║ PUSH29                            708.854 ║
║ PUSH30                            730.854 ║
║ PUSH31                            752.854 ║
║ PUSH32                            774.854 ║
║ DUP1                               63.000 ║
║ DUP2                               67.000 ║
║ DUP3                               67.000 ║
║ DUP4                               67.000 ║
║ DUP5                               67.000 ║
║ DUP6                               67.000 ║
║ DUP7                               67.000 ║
║ DUP8                               67.000 ║
║ DUP9                               67.000 ║
║ DUP10                              67.000 ║
║ DUP11                              67.000 ║
║ DUP12                              67.000 ║
║ DUP13                              65.000 ║
║ DUP14                              67.000 ║
║ DUP15                              67.000 ║
║ DUP16                              67.000 ║
║ SWAP1                              67.667 ║
║ SWAP2                              67.667 ║
║ SWAP3                              67.667 ║
║ SWAP4                              67.667 ║
║ SWAP5                              67.667 ║
║ SWAP6                              67.667 ║
║ SWAP7                              67.667 ║
║ SWAP8                              67.667 ║
║ SWAP9                              67.667 ║
║ SWAP10                             67.667 ║
║ SWAP11                             67.667 ║
║ SWAP12                             67.667 ║
║ SWAP13                             67.667 ║
║ SWAP14                             67.667 ║
║ SWAP15                             65.667 ║
║ SWAP16                             67.667 ║
║ CALL                               56.371 ║
║ STATICCALL                         53.248 ║
║ DELEGATECALL                       52.286 ║
║ CREATE                              5.046 ║
║ CREATE2                             7.067 ║
║ RETURN                              1.000 ║
║ REVERT                              1.000 ║
╠═╡ Ergs/gas (-%) ╞═╡ EVMInterpreter M3B3 ╞═╣
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞═════╡ EVMInterpreter MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                                 NaN ║
╠═╡ Cycles (-%) ╞═══╡ EVMInterpreter MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞═════╡ EVMInterpreter MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞══════════╡ Real life M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞════════╡ Real life M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞══════════╡ Real life M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞══════════╡ Real life MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞════════╡ Real life MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞══════════╡ Real life MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

@antonbaliasnikov antonbaliasnikov force-pushed the aba-ci-rebrand-0.8.25 branch from 7168c49 to 29888cf Compare May 28, 2024 12:51
@antonbaliasnikov antonbaliasnikov marked this pull request as ready for review May 28, 2024 14:15
@antonbaliasnikov antonbaliasnikov force-pushed the aba-ci-rebrand-0.8.25 branch from 29888cf to fcb9914 Compare May 28, 2024 14:19
@antonbaliasnikov
Copy link
Collaborator Author

@hedgar2017 , @abinavpp , hey guys!

The final tests are running now, I'm opening this for a final review. I properly tested it with many versions and aligned CI to properly work on all of them.

@abinavpp , as soon as we merge it, you can rebase from 0.8.25 and unblock testing on your branch.

@antonbaliasnikov antonbaliasnikov force-pushed the aba-ci-rebrand-0.8.25 branch from 9edb28a to 32940ba Compare May 28, 2024 14:42
Copy link
Collaborator

@hedgar2017 hedgar2017 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonbaliasnikov have you checked if there released binary name matches the format of the latest release?

.github/workflows/build-release.yaml Outdated Show resolved Hide resolved
cmake/templates/BuildInfo.h.in Outdated Show resolved Hide resolved
cmake/templates/BuildInfo.h.in Outdated Show resolved Hide resolved
@hedgar2017
Copy link
Collaborator

@antonbaliasnikov I'm granting you admin rights to merge these PRs through those failed tests or even without waiting for the whole workflow to finish.
So @abinavpp can move on to rebasing and fixing the patch.

@antonbaliasnikov
Copy link
Collaborator Author

@antonbaliasnikov I'm granting you admin rights to merge these PRs through those failed tests or even without waiting for the whole workflow to finish. So @abinavpp can move on to rebasing and fixing the patch.

Ok, these failures are caused by the internal compiler error:
E-M2B3 0.8.25 INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: solc errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]

@antonbaliasnikov
Copy link
Collaborator Author

@antonbaliasnikov have you checked if there released binary name matches the format of the latest release?

Yes, I checked before, but I'll do one more final check just to make sure.

@abinavpp
Copy link
Collaborator

@antonbaliasnikov I'm granting you admin rights to merge these PRs through those failed tests or even without waiting for the whole workflow to finish. So @abinavpp can move on to rebasing and fixing the patch.

Ok, these failures are caused by the internal compiler error: E-M2B3 0.8.25 INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: solc errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]

This will be fixed by #549

@antonbaliasnikov antonbaliasnikov force-pushed the aba-ci-rebrand-0.8.25 branch from 32940ba to e58154a Compare May 28, 2024 16:36
Copy link
Collaborator

@abinavpp abinavpp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@hedgar2017 hedgar2017 merged commit 03f98ef into 0.8.25 May 28, 2024
11 of 14 checks passed
@hedgar2017 hedgar2017 deleted the aba-ci-rebrand-0.8.25 branch May 28, 2024 18:48
abinavpp pushed a commit that referenced this pull request May 29, 2024
hedgar2017 pushed a commit that referenced this pull request May 30, 2024
ci: use full tag for zksync version (#569)
abinavpp pushed a commit that referenced this pull request Jun 2, 2024
ci: use full tag for zksync version (#569)
abinavpp pushed a commit that referenced this pull request Jun 2, 2024
ci: use full tag for zksync version (#569)
hedgar2017 pushed a commit that referenced this pull request Jun 3, 2024
ci: use full tag for zksync version (#569)
antonbaliasnikov added a commit that referenced this pull request Jun 5, 2024
ci: use full tag for zksync version (#569)
antonbaliasnikov added a commit that referenced this pull request Jun 5, 2024
ci: use full tag for zksync version (#569)
antonbaliasnikov added a commit that referenced this pull request Jun 5, 2024
ci: use full tag for zksync version (#569)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants